Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

preserve non-JSON lines during normalization #172

Merged
merged 1 commit into from
Apr 16, 2019

Conversation

RalfJung
Copy link
Contributor

@RalfJung RalfJung commented Apr 7, 2019

Fixes #169

I am not sure what the usual process is, do you want the files here to be verbatim identical to what is in rustc? The diff seems quite large currently, at least for runtest.rs. I will submit the same thing there as well, if it still applies.

@RalfJung
Copy link
Contributor Author

@Manishearth @laumann The corresponding rustc PR has been r+'d. Does that mean we can land this here?

Both Miri and Clippy had missed test failures because of this, so it seems prudent to fix this quickly.

Ideally we'd also carry over the part from rustc's compiletest that checks the exit code of the compiler. However, I have no idea how upstream syncing is handled -- see #175.

@Manishearth
Copy link
Owner

Manishearth commented Apr 10, 2019 via email

@RalfJung
Copy link
Contributor Author

WDYM? I upstreamed this, it is waiting-for-bors. I am asking for it to also land here.

@Manishearth
Copy link
Owner

That's what I meant by "upstream", should have said "uplift", sorry.

To be clear: go ahead and make a version of your PR for this repo

@RalfJung
Copy link
Contributor Author

Uh... this very PR we are talking in is a version of that PR for this repo...?

@Manishearth
Copy link
Owner

Manishearth commented Apr 11, 2019 via email

@RalfJung
Copy link
Contributor Author

That's okay. :) I was just terribly confused. ;)

@phansch
Copy link
Contributor

phansch commented Apr 16, 2019

The upstream PR has been merged, it would be nice to get this into compiletest-rs, too =)

@RalfJung
Copy link
Contributor Author

(Note that CI is red for different reasons that are fixed by #170.)

@RalfJung RalfJung force-pushed the json-normalization branch from 71f940f to 46c4b13 Compare April 16, 2019 14:54
@RalfJung
Copy link
Contributor Author

Rebased to rerun CI.

@RalfJung
Copy link
Contributor Author

CI has a happy green :)

@RalfJung
Copy link
Contributor Author

@Manishearth can we please merge this? I just spent 2h debugging a really weird issue in Miri where CI on Windows seemed to not catch a problem, until realizing that actually it was this ICEs-are-ignored issue again.

@Manishearth Manishearth merged commit 5e05ec7 into Manishearth:master Apr 16, 2019
@RalfJung RalfJung deleted the json-normalization branch March 17, 2022 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ui test with ICE does not fail
3 participants